Merge branch 'denx'
authorAndy Fleming <[email protected]>
Tue, 9 Sep 2008 21:16:20 +0000 (16:16 -0500)
committerAndrew Fleming-AFLEMING <[email protected]>
Tue, 9 Sep 2008 21:16:20 +0000 (16:16 -0500)

Trivial merge